Fix launching apps / search results in new workspaces by dragging

When I landed the new workspace tracker move, I didn't realize there
was public API being used by clients here. Add that back.

https://bugzilla.gnome.org/show_bug.cgi?id=698593

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 89ccf694ec319ba1779478c5a300113efb9786d8..022cd1eb7083c4be40cc1f712d706c4fdf1e0e5b 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -479,6 +479,10 @@ const WindowManager = new Lang.Class({
                                                 false, -1, 1);
     },
 
+    keepWorkspaceAlive: function(workspace, duration) {
+        this._workspaceTracker.keepWorkspaceAlive(workspace, duration);
+    },
+
     setCustomKeybindingHandler: function(name, modes, handler) {
         if (Meta.keybindings_set_custom_handler(name, handler))
             this.allowKeybinding(name, modes);

diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 6b631d1d96e42f6190d214dc6dfb9072742035d8..c5cd7e36084983705c8f5f091e7928b927d75f99 100644 (file)
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -764,8 +764,8 @@ const ThumbnailsBox = new Lang.Class({
                 // to open its first window within some time, as tracked by Shell.WindowTracker.
                 // Here, we only add a very brief timeout to avoid the _immediate_ removal of the
                 // workspace while we wait for the startup sequence to load.
-                Main.keepWorkspaceAlive(global.screen.get_workspace_by_index(newWorkspaceIndex),
-                                        WORKSPACE_KEEP_ALIVE_TIME);
+                Main.wm.keepWorkspaceAlive(global.screen.get_workspace_by_index(newWorkspaceIndex),
+                                           WORKSPACE_KEEP_ALIVE_TIME);
             }
 
             // Start the animation on the workspace (which is actually